Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge upstream #3

Merged
merged 28 commits into from
Mar 11, 2022
Merged

Merge upstream #3

merged 28 commits into from
Mar 11, 2022

Conversation

silv3rr
Copy link
Owner

@silv3rr silv3rr commented Mar 11, 2022

No description provided.

glftpd and others added 28 commits November 8, 2014 21:35
Calendar Weeks + Doc-typo fix
footools-mp3genre.patch ugly patch for foopre to add mp3 genre in PRE
created makefile for mp3genre, fixed a few compiler warnings
merged commits 2014/15 commits from glftpd/foo-tools.git
updated mp3 genres from pzs-ng/zipscript/src/multimedia.c
mp3genre.h header included in foo-pre.c
mp3genre.h: switched back id3 genres
get_mp3_genre function now returns id3_genre
merge changes from silv3rr
include mp3genre makefile in configure
this fixes foo-pre creating a new userfile with its own uid/gid (usually 0:0).
preserving uid/gid of the old userfile is particularly useful when hiding pre
users from stats commands by setting them to 99:99 (see glftpd docs).
pre: preserve uid/gid when creating a new userfile
@silv3rr silv3rr merged commit 26f2a3e into silv3rr:master Mar 11, 2022
@silv3rr silv3rr changed the title Merge upstream, try #2 Merge upstream Mar 11, 2022
@silv3rr
Copy link
Owner Author

silv3rr commented Mar 11, 2022

Merged changes with https://github.com/glftpd/foo-tools

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants